rolled back
Merge branch 'master' of https://github.com/bryancquach/personal-site

Conflicts:
	css/index.css