Merge branch 'master' into non-edited

00/README.md

@@ -10,7 +10,7 @@ This book is about the revolutionary computational technique, *fragment shaders*
 
 Fragment shaders give you total control over the pixels rendered on the screen at a super fast speed. This is why they're used in all sort of cases, from video filters on cellphones to incredible 3D video games.
 
-![Journey by The Game Company](journey.jpg)
+![Journey by That Game Company](journey.jpg)
 
 In the following chapters you will discover how incredibly fast and powerful this technique is and how to apply it to your professional and personal work.
 

README.md

@@ -61,6 +61,8 @@ This is a gentle step-by-step guide through the abstract and complex universe of
 
 Patricio studied and practiced psychotherapy and expressive art therapy. He holds an MFA in Design & Technology from Parsons The New School, where he now teaches. Currently he works as a Graphic Engineer at Mapzen making openSource mapping tools.
 
+<p class="header"><a href="http://twitter.com/patriciogv" target="_blank">Twitter</a> - <a href="https://github.com/patriciogonzalezvivo" target="_blank">GitHub</a> - <a href="https://vimeo.com/patriciogv" target="_blank">Vimeo</a> - <a href="https://www.flickr.com/photos/106950246@N06/" target="_blank"> Flickr</a></div>
+
 ## Acknowledgements
 
 Thanks to my wife [Jen Lowe](http://www.datatelling.com/), for her unconditional support, help and time editing this book.

css/style.css

@@ -84,7 +84,6 @@ img {
 }
 
 .caption {
-    /*font-family: Baskerville, "Times New Roman", serif;*/
     font-style: italic;
     font-size: 16px;
     line-height: 1.3;
@@ -92,8 +91,6 @@ img {
 }
 
 .header {
-    /*font-family: Baskerville, "Times New Roman", serif;*/
-    /*font-style: italic;*/
     font-size: 16px;
     line-height: 0px;
     margin-top: 60px;
@@ -106,7 +103,6 @@ img {
     font-style: italic;
     text-decoration: none;
     border:0!important;
-
 }
 
 a:hover, a:visited, a:link, a:active {