reset
Merge branch 'master' of https://github.com/csgregorian/csgregorian.github.io

Conflicts:
	index.css
	index.html