trial commit
Merge branch 'master' of https://github.com/jdashley27/frontend-nanodegree-resume

Conflicts:
	css/style.css
	index.html
	js/resumeBuilder.js