Minor changes

attend.html

@@ -120,6 +120,58 @@ <h2 class="section-head"><span>Attend</span></h2>
 </div>
 
 
+<!-- container b-->
+<div class="container">
+    <div class="row">
+        <h2 class="section-head"><span>Discover Austin</span></h2>
+    </div>
+</div>  
+
+<div class="container">
+    <div class="intro-text">
+        <div class="row">
+            <div class="col-md-12">
+                <div class="intro-paragraph">
+                    <br>
+                    <p style="text-align:center;"><img src="img/Discover_ATX_1.jpg" width="100%"></p>
+                    <p class="lead">Imagine a city bursting with an entrepreneurial spirit, a commitment to personal freedom and a passion for unearthing new discoveries. Add a vibrant, internationally renowned music, film and art scene, along with a thriving economy that leads the way in the technology, engineering and health care industries. Throw in a glittering lake running through the center of the city, big blue skies, gleaming Texas sunshine and the natural beauty of the surrounding Hill Country. Underline all of that with an open-minded sense of community, a serious commitment to breakfast tacos and a deep appreciation for all kinds of people and all kinds of dreams, and you've got Austin, Texas — one of the most amazing places in the world, and the city we're proud to call home.</p>
+
+                    <p class="atx">Places to See in Austin</p>
+                    <p style="text-align:center;"><img src="img/attend_places_2.jpg" width="100%"></p>
+                    <div class="col-sm-4 place_to_see">
+                            <p class="lead" style="font-weight:bold;"><a class="theme-link" href="http://6street.com/">6th Street</a></p>
+                            <p class="lead">Popular, trendy area of downtown Austin known for clubs, live music and unique restaurants.</p>
+                        </div>
+                        <div class="col-sm-4 place_to_see">
+                            <p class="lead" style="font-weight:bold;"><a class="theme-link" href="http://zilkerpark.org/">Zilker Park </a></p>
+                            <p class="lead">Home to the Austin Nature and Science Center, Botanical Gardens, Hillside Theatre and the Zephyr.</p>
+                        </div>
+                    <div class="col-sm-4 place_to_see">
+                            <p class="lead" style="font-weight:bold;"><a class="theme-link" href="http://www.tripadvisor.com/Attraction_Review-g30196-d304817-Reviews-SoCo_District-Austin_Texas.html">South Congress (SoCo) </a></p>
+                            <p class="lead">Home to eclectic shops and retro clothing stores and the very popular First Thursday event each month.</p>
+                        </div>
+                    <p style="text-align:center;"><img src="img/attend_places.jpg" width="100%"></p>
+
+
+                        <div class="col-sm-4 place_to_see">
+                            <p class="lead" style="font-weight:bold;"><a class="theme-link" href="http://www.tripadvisor.com/Attraction_Review-g30196-d116421-Reviews-Barton_Springs_Pool-Austin_Texas.html">Barton Springs Pool</a></p>
+                            <p class="lead">The 900ft pool was formed when Barton Creek was dammed up, so it has a natural rock and gravel bottom.</p>
+                        </div>
+                        <div class="col-sm-4 place_to_see">
+                            <p class="lead" style="font-weight:bold;"><a class="theme-link" href="http://www.thestoryoftexas.com/">Bob Bullock Texas State History Museum</a></p>
+                            <p class="lead">The story of Texas is told through films and exhibits; home to Austin’s only IMAX theater.</p>
+                        </div>
+                        <div class="col-sm-4 place_to_see">
+                            <p class="lead" style="font-weight:bold;"><a class="theme-link" href="http://tpwd.texas.gov/state-parks/enchanted-rock">Enchanted Rock</a></p>
+                            <p class="lead">Texas Capitol is the largest in gross square footage of all state capitols and is second in total size only to the National Capitol.</p>
+                        </div>
+
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
         <!-- Footer -->
         <footer>
             <div class="container">

past meetings.html

@@ -96,7 +96,11 @@
                                 <h2 class="section-heading">Overview</h2></li>
                         </ul>
                         <p class="lead">
+<<<<<<< HEAD
+                            AAAI HCOMP is the premier venue for disseminating the latest research findings on crowdsourcing and human computation. While artificial intelligence (AI) and human-computer interaction (HCI) represent traditional mainstays of the conference, HCOMP believes strongly in inviting, fostering, and promoting broad, interdisciplinary research. This field is particularly unique in the diversity of disciplines it draws upon, and contributes to, ranging from human-centered qualitative studies and HCI design, to computer science and artificial intelligence, economics and the social sciences, all the way to law and policy. We promote the exchange of scientific advances in human computation and crowdsourcing not only among researchers, but also engineers and practitioners, to encourage dialogue across disciplines and communities of practice.
+=======
                             AAAI HCOMP is the premier venue for disseminating the latest research findings on crowdsourcing and human computation. While artificial intelligence (AI) and human-computer interaction (HCI) represent traditional mainstays of the conference, HCOMP believes strongly in inviting, fostering, and promoting broad, interdisciplinary research. This field is particularly unique in the diversity of disciplines it draws upon, and contributes to, ranging from human-centered qualitative studies and HCI design, to computer science and artificial intelligence, economics and the social sciences, all the way to policy and ethics. We promote the exchange of scientific advances in human computation and crowdsourcing not only among researchers, but also engineers and practitioners, to encourage dialogue across disciplines and communities of practice.
+>>>>>>> utir/master
                         </p>
                         <p class="lead">
                             Past meetings include three AAAI HCOMP conferences (2013-2015) and four earlier workshops, held at the AAAI Conference on Artificial Intelligence (2011-2012), and the ACM SIGKDD Conference on Knowledge Discovery and Data Mining (2009-2010).
@@ -289,6 +293,48 @@ <h2 class="section-heading">2013</h2></li>
                         </p>
 
                     </div>
+<<<<<<< HEAD
+                </div>
+            </div>
+        </div>
+</div>
+
+
+        <a name="awards"></a>
+        <div class="container">
+            <div class="row">
+                <h2 class="section-head"><span>Library</span></h2>
+            </div>
+        </div>
+
+<div class="container">
+    <div class="intro-text">
+        <div class="row">
+            <div class="col-md-12">
+                <div class="intro-paragraph">
+                    <ul class="list-inline">
+                        <li><i class="icon-font fa fa-file-text"></i></li>
+                        <li>
+                            <h2 class="section-heading">Past Reports</h2></li>
+                    </ul>
+
+                    <p class="lead">
+                        <mark>HCOMP 2013 Workshops</mark>
+                        <a class="lead" href="http://www.aaai.org/ojs/index.php/aimagazine/article/download/2537/2427">
+			Workshops Held at the First AAAI Conference on Human Computation and Crowdsourcing: A Report</a>. Tatiana Josephy, Matthew Lease, Praveen Paritosh, Markus Krause, Mihai Georgescu, Michael Tjalve, and Daniela Braga.
+                        <em>AI Magazine</em>, 35(2), 75-78, 2014.
+                    </p>
+
+                    <p class="lead">
+                        <mark>HCOMP 2009</mark>
+                        <a class="lead" href="http://kdd.org/exploration_files/v11-2-14-HComp09.pdf">A report on the human computation workshop (HCOMP 2009)</a>. Panagiotis G. Ipeirotis, Raman Chandrasekar, and Paul N. Bennett. SIGKDD Explorations 11, no. 2 (2009): 80-83.
+                    </p>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+=======
                 </div>
             </div>
         </div>
@@ -322,6 +368,7 @@ <h2 class="section-heading">Past Reports</h2></li>
                 </p>
             </div>
         </div>
+>>>>>>> utir/master
 
         <!-- Footer -->
         <footer>
@@ -362,4 +409,8 @@ <h2 class="section-head"><span>Sponsors</span></h2>
 
 </body>
 
+<<<<<<< HEAD
+</html>
+=======
 </html>
+>>>>>>> utir/master