Some updates for style

diff --cc css/style.css
index 1f301bddb7e9779dad441ef6b3e6e35b57b8147f,2292f8bb688a73566475520ccabf9186bfb7aeb7..cf04f3606e55482b3e7dc28c3defd166dfb97ccb
--- 1/css/style.css
--- 2/css/style.css
+++ b/css/style.css
@@@ -1,7 -1,7 +1,7 @@@
  
  html, body, table, textarea, input[type="text"] {
    background:#eee;
--  color: #555;
++  color: #000;
    font-size: 12px;
    font-weight: normal;
    font-family: monaco, "Lucida Console", monospace;
@@@ -31,8 -31,8 +31,8 @@@ a 
  h1, h2, h3, h4, h5, h6 {
    /*font-family: helvetica, arial, verdana, sans-serif;*/
    font-weight: normal;
--  color: #000;
-   font-size:1em; }
 -  font-size:1em; line-height:1em; }
++  color: #555;
++  font-size:1em; line-height: 1.5em; }
  h1 a, h2 a, h3 a, h4 a, h5 a, h6 a {
    color:#000;
    text-decoration: none;
@@@ -310,7 -313,7 +313,8 @@@ height:auto
  }
  .entry .title a {
      margin-bottom:1em;
--    /*color:#999;*/
++    font-weight:normal;
++    color:#999;
  }
  
  .entry .metadata .date {

diff --cc lib/config.ini
index 9e9443e8e53560d573df85d2b200f77537e68f1e,cd2b48dcddce096765c17a049e8b51513ed990ae..2e03ef8c415ff634331a4452f329bee80b2724ef
--- 1/lib/config.ini
--- 2/lib/config.ini
+++ b/lib/config.ini
@@@ -1,5 -1,5 +1,6 @@@
  ; settings
- site_title  = gabriel dunne
+ site_title  = Gabriel Dunne
++>>>>>>> 023e52b52d9d2b10f550646e41a34cc3ac2d3cb2
  clean_urls  = 1
  limit       = 1000
  ; http://php.net/manual/en/function.date.php

diff --cc pages/info
index 58af9f5b8316d4335d7cb83b7c3555384a9e3cbb,58af9f5b8316d4335d7cb83b7c3555384a9e3cbb..181c36b4d61b49e5b8fe437aa56e83fe9bbbe71f
--- 1/pages/info
--- 2/pages/info
+++ b/pages/info
@@@ -6,18 -6,18 +6,16 @@@ template = pag
  </div>\r
  -->\r
  \r
--Gabriel Labov Dunne (b. 1981, San Francisco) works with multiple mediums and technologies to explore audiovisual vibration, space, structures, and rhythms of the perceivable and imperceivable universe. His multi-disciplinary art and design work has shown internationally in solo and group exhibitions, performances, galleries, public space, and is featured in interactive software, music videos, sound works, and film projects.\r
++Gabriel Labov Dunne  \r
++Artist and Designer  \r
  \r
--<br />\r
--\r
--studio at gabrieldunne dot com  \r
--blog: [quilime.com](http://quilime.com)  \r
--twitter: @quilime  \r
  \r
++###### network    \r
++[email](mailto:studio@gabrieldunne.com)    \r
++[blog](http://quilime.com)  \r
++[twitter](http://twitter.com/quilime)  \r
  <br />\r
  \r
--\r
--\r
  ###### edu\r
  2003 B.A. Design | Media Art, UCLA     \r
  2001 Pont Aven School of Art  \r
@@@ -61,15 -61,15 +59,9 @@@
  <br />\r
  <br />\r
  \r
--###### residencies / collaborations\r
--2011&mdash;2012 Studio Collaboration w/ Vishal K. Dar, New Delhi, India.    \r
--2009&mdash;2010 Gray Area Foundation for the Arts, San Francisco\r
--<br />\r
--<br />\r
--\r
--\r
  ###### teaching / lectures\r
--2012 Film/Code/Remix, BAVC, San Francisco  \r
++2013 Processing Workshop, Upload Festival, San Francisco,    \r
++2012 Film/Code/Remix, BAVC, San Francisco,    \r
  2012 Processing, ACCU, Symantic, Palo Alto     \r
  2012 Processing, ACCU Davis Linux Users Group, Davis, CA    \r
  2011 Open Source: Creative Code. BAVC, San Francisco,  \r
@@@ -88,8 -88,8 +80,15 @@@
  <br />\r
  <br />\r
  \r
++###### residencies / collaborations\r
++2011&mdash;2012 Studio Collaboration w/ Vishal K. Dar, New Delhi, India.    \r
++2009&mdash;2010 Gray Area Foundation for the Arts, San Francisco\r
++<br />\r
++<br />\r
++\r
++\r
  \r
--###### featured in \r
++###### media   \r
  SIGGRAPH  \r
  Creators Project  \r
  Discover Magazine  \r
@@@ -100,11 -100,11 +99,13 @@@ FOCUS Itali
  AD: Architectural Digest  \r
  Contemporary Art of Science and Technology  \r
  Art College Radio SF  \r
--HDRI Magazine\r
++HDRI Magazine  \r
++But Does It Float  \r
++Creativity Online  \r
  <br />\r
  <br />\r
  \r
--###### professional\r
++###### affiliated  \r
  Obscura Digital  \r
  BAVC  \r
  Tessellated Group  \r
@@@ -119,7 -119,7 +120,7 @@@ Motion Theor
  <!--\r
  \r
  \r
--###### professional\r
++###### clients\r
  2010&mdash;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Bay Area Video Coalition. Youth Instructor   \r
  2005&mdash;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Tessellated Group. Designer  \r
  2009&mdash;2010&nbsp;&nbsp; Gray Area Foundation for the Arts. Studio Director  \r

diff --cc templates/projectlist.html.tpl
Simple merge