sync up
Merge branch 'master' of https://github.com/jcitysinner/Jobcogneato

Conflicts:
	styles/main.css