udpated ga icon. updated header logo. added new favicon
Merge branch 'gh-pages' of ../gh-pages into gh-pages

Conflicts:
	css/main.css.css
	css/projects.css.css
	img/iconsprite.png
Move favicon into root directory
Merge branch 'gh-pages' of ../gh-pages into gh-pages
Fix path to favicon
Merge branch 'gh-pages' of ../gh-pages into gh-pages