Bug fixing v1
Merge branch 'gh-pages' of https://github.com/zahschag/Zahscha-Gonzalez-Portfolio into gh-pages

Conflicts:
	css/main.css
	main.html