Tweaking the resume page
Merge branch 'master' of https://github.com/huttj/new-site

Conflicts:
	css/main.css