websit eoverhaul
update
Merge branch 'master' of github.com:chrisalcantara/chrisalcantara.github.io
Conflicts:
	css/style.css
	index.html