please merge

README.md

@@ -1,30 +1,28 @@
-Agency Jekyll theme
+# Website for the Coalition against Climate Change
 ====================
 
 Agency theme based on [Agency bootstrap theme ](https://startbootstrap.com/template-overviews/agency/)
 
-# How to use
+<!--# How to use
 
-###Portfolio 
+<!--###Portfolio 
 
-Portfolio projects are in '/_posts'
+<!--Portfolio projects are in '/_posts'
 
-Images are in '/img/portfolio'
+<!--Images are in '/img/portfolio'
 
-###About
+<!--###About
 
-Images are in '/img/about/'
+<!--Images are in '/img/about/'
 
-###Team
+<!--###Team
 
-Team members and info are in '_config.yml'
+<!--Team members and info are in '_config.yml'
 
-Images are in '/img/team/'
+<!--Images are in '/img/team/'
 
 
-# Demo
+<!--# Demo
 
-View this jekyll theme in action [here](https://y7kim.github.io/agency-jekyll-theme)
+<!--View this jekyll theme in action [here](https://y7kim.github.io/agency-jekyll-theme)
 
-=========
-For more details, read [documentation](http://jekyllrb.com/)

_config.yml

@@ -1,65 +1,66 @@
-url: https://y7kim.github.io
-baseurl: /agency-jekyll-theme/
+url: https://caccoalition.github.io/
+baseurl:
 
 # Site settings
-title: Awesome Title
-email: your-email@domain.com
-description: "Write an awesome description for your new site here. You can edit this line in _config.yml. It will appear in your document head meta (for Google search results) and in your feed.xml site description."
+title: Coalition Against Climate Change
+email: coalitionagainstclimatechange@gmail.com
+description: "We are a USA based nonprofit that seeks to raise awareness about climate change and create change that helps preserve our planet."
 
 
 # Team names, titles and social links
 people:
-- name: Kay Garland
-  pic: 1
-  position: Lead Designer
-  social:
-    - title: twitter
-      url: #
-    - title: facebook
-      url: #
-    - title: stack-overflow
-      url: #
-
-- name: Larry Parker
+- name: Sanjay Nagaraj
   pic: 2
-  position: Lead Marketer
+  position: Founder and Director of Operations
   social:
-    - title: twitter
-      url: #
     - title: facebook
-      url: #
-    - title: linkedin
-      url: #
-
-- name: Diana Petersen
+      url: https://www.facebook.com/sanjayn2816
+    - title: instagram
+      url: https://www.instagram.com/sanjay_n1/
+    - title: twitter
+      url: https://twitter.com/SanjayNagaraj11
+  bio: Sanjay is a junior in the Houston area. He has a passion for the preservation of the environment and is passionate about spreading this message. He is involved with many local preservation groups and actively participates in trash-offs and city-wide cleanups. Additionally, his passion for biology motivates him to find biological solutions to diseases with epigenetic causes. In his free time, Sanjay enjoys browsing wikipedia, finding biology jokes, and watching ExtraHistory.
+- name: Akash Krishna
   pic: 3
-  position: Lead Developer
+  position: Chief Editor
   social:
+    - title: facebook
+      url: https://www.facebook.com/profile.php?id=100008685758378
+    - title: instagram
+      url: #
     - title: twitter
       url: #
+  bio: "Akash is a senior from Houston. He began to care about the environment on visits to India when seeing the extremely poor conditions that are experienced in less affluent regions of the world. In his free time, Akash loves to watch sports games and considers himself an avid sports fan of both the Texans and the Rockets."
+- name: Bailey Hirota
+  pic: 1
+  position: Events Coordinator
+  social:
     - title: facebook
       url: #
-    - title: google-plus
-      url: #
+    - title: instagram
+      url: https://www.instagram.com/baileynumata
+    - title: twitter
+      url: #a
+  bio: Bailey is a senior from Southern California. In her free time, she likes to go to the beach, hike, or bake. Bailey is passionate about environmental injustice because it is essential to the survival of the human race and preservation of biodiversity, which makes life beautiful.
 
 # Social networks usernames (many more available: google-plus, flickr, dribbble, pinterest, instagram, tumblr, linkedin, etc.)
 social:
-  - title: twitter
-    url: http://twitter.com/jekyllrb
-  - title: facebook
-    url:
-  - title: stack-overflow
-    url: http://stackoverflow.com/questions/tagged/jekyll
-  - title: bitbucket 
-    url: http://bitbucket.org/jekyll
-  - title: github
-    url: http://github.com/jekyll
+- title: instagram
+  url: https://www.instagram.com/caccoalition/
+# - title: facebook
+ #   url:
+ # - title: stack-overflow
+ #   url: http://stackoverflow.com/questions/tagged/jekyll
+ # - title: bitbucket 
+ #   url: http://bitbucket.org/jekyll
+- title: github
+  url: https://github.com/caccoalition/caccoalition.github.io
 
 # Postal address (add as many lines as necessary)
-address:
-  - line: 3481 Melrose Place
-  - line: Beverly Hills, CA 90210
+#address:
+  #- line: 3481 Melrose Place
+ # - line: Beverly Hills, CA 90210
 
 # Build settings
 markdown: kramdown
-permalink: pretty
+permalink: pretty

_includes/about.html

@@ -1,80 +1,45 @@
-<!-- About Section -->
+<html>
+        <body id="page-top" class="index">
+
     <section id="about">
         <div class="container">
             <div class="row">
                 <div class="col-lg-12 text-center">
                     <h2 class="section-heading">About</h2>
-                    <h3 class="section-subheading text-muted">Lorem ipsum dolor sit amet consectetur.</h3>
+                    <h3 class="section-subheading text-muted">We are a nonprofit dedicated to increasing awareness about environmental issues and combating climate change.</h3>
                 </div>
             </div>
-            <div class="row">
-                <div class="col-lg-12">
-                    <ul class="timeline">
-                        <li>
-                            <div class="timeline-image">
-                                <img class="img-circle img-responsive" src="img/about/1.jpg" alt="">
-                            </div>
-                            <div class="timeline-panel">
-                                <div class="timeline-heading">
-                                    <h4>2009-2011</h4>
-                                    <h4 class="subheading">Our Humble Beginnings</h4>
-                                </div>
-                                <div class="timeline-body">
-                                    <p class="text-muted">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Sunt ut voluptatum eius sapiente, totam reiciendis temporibus qui quibusdam, recusandae sit vero unde, sed, incidunt et ea quo dolore laudantium consectetur!</p>
-                                </div>
-                            </div>
-                        </li>
-                        <li class="timeline-inverted">
-                            <div class="timeline-image">
-                                <img class="img-circle img-responsive" src="img/about/2.jpg" alt="">
-                            </div>
-                            <div class="timeline-panel">
-                                <div class="timeline-heading">
-                                    <h4>March 2011</h4>
-                                    <h4 class="subheading">An Agency is Born</h4>
-                                </div>
-                                <div class="timeline-body">
-                                    <p class="text-muted">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Sunt ut voluptatum eius sapiente, totam reiciendis temporibus qui quibusdam, recusandae sit vero unde, sed, incidunt et ea quo dolore laudantium consectetur!</p>
-                                </div>
-                            </div>
-                        </li>
-                        <li>
-                            <div class="timeline-image">
-                                <img class="img-circle img-responsive" src="img/about/3.jpg" alt="">
-                            </div>
-                            <div class="timeline-panel">
-                                <div class="timeline-heading">
-                                    <h4>December 2012</h4>
-                                    <h4 class="subheading">Transition to Full Service</h4>
-                                </div>
-                                <div class="timeline-body">
-                                    <p class="text-muted">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Sunt ut voluptatum eius sapiente, totam reiciendis temporibus qui quibusdam, recusandae sit vero unde, sed, incidunt et ea quo dolore laudantium consectetur!</p>
-                                </div>
-                            </div>
-                        </li>
-                        <li class="timeline-inverted">
-                            <div class="timeline-image">
-                                <img class="img-circle img-responsive" src="img/about/4.jpg" alt="">
-                            </div>
-                            <div class="timeline-panel">
-                                <div class="timeline-heading">
-                                    <h4>July 2014</h4>
-                                    <h4 class="subheading">Phase Two Expansion</h4>
-                                </div>
-                                <div class="timeline-body">
-                                    <p class="text-muted">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Sunt ut voluptatum eius sapiente, totam reiciendis temporibus qui quibusdam, recusandae sit vero unde, sed, incidunt et ea quo dolore laudantium consectetur!</p>
-                                </div>
-                            </div>
-                        </li>
-                        <li class="timeline-inverted">
-                            <div class="timeline-image">
-                                <h4>Be Part
-                                    <br>Of Our
-                                    <br>Story!</h4>
-                            </div>
-                        </li>
-                    </ul>
+            <div class="row text-center">
+                <div class="col-md-4">
+                    <span class="fa-stack fa-4x">
+                        <i class="fa fa-circle fa-stack-2x text-primary"></i>
+                        <i class="fa fa-flag fa-stack-1x fa-inverse"></i>
+                    </span>
+                    <h4 class="service-heading">Rallies and Events</h4>
+                    <p class="text-muted">In order to raise awareness, we focus on organizing events throughout the United States, that range from city cleanups to informational workshops.</p>
+                </div>
+                <div class="col-md-4">
+                    <span class="fa-stack fa-4x">
+                        <i class="fa fa-circle fa-stack-2x text-primary"></i>
+                        <i class="fa fa-laptop fa-stack-1x fa-inverse"></i>
+                    </span>
+                    <h4 class="service-heading">Social Media</h4>
+                    <p class="text-muted">Our largest platform to increase awareness is social media. Go follow our <a href="https://www.instagram.com/caccoalition/">Instagram</a>!</p>
+                </div>
+                <div class="col-md-4">
+                    <span class="fa-stack fa-4x">
+                        <i class="fa fa-circle fa-stack-2x text-primary"></i>
+                        <i class="fa fa-leaf fa-stack-1x fa-inverse"></i>
+                    </span>
+                    <h4 class="service-heading">Community Projects</h4>
+                    <p class="text-muted">In order to enact change in communities around the world, we create initiatives to plant gardens and increase eco-friendly products.</p>
+                </div>
+                <div class="col-lg-12 text-center">
+                    <h2 class="section-heading"><br><br> Our Mission</h2>
+                    <h3 class="section-subheading text-muted"><br> Our mission to create a comprehensive framework from which solutions and actions can be taken to prevent climate change from continuing to impact our world.</h3>
                 </div>
             </div>
         </div>
-    </section>
+    </section>
+    </body>
+<html>