The sight is turning well for the most part, just gotta do a little more editing here and there
Merge branch 'master' of https://github.com/jjrocks/jjs-website
Merge branch 'master' of https://github.com/jjrocks/jjs-website

Conflicts:
	index.html
	resources/css/header.css