Merging from gh-pages
Merging topics from gh-pages
Adding twitter handle
Added media queries for small screens
Merge branch 'gh-pages'

Conflicts:
	index.html
	style.css
merging from ghpages
merge
;fajw;eorj234 conflicts
Changes to footer and link colors
Tweaking copy of about.html
Merge branch 'master' into gh-pages