Merge branch 'gh-pages' of https://github.com/CaffeinePrism/gsgranite into gh-pages

Conflicts:
	.gitignore
	css/main.css
	index.html
Merge branch 'gh-pages' of https://github.com/CaffeinePrism/gsgranite into gh-pages

Conflicts:
	css/main.css