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
Changed where projects.css was at
-a
Added a lot more stuff to the css. Whooop whoop
Merge branch 'master' of https://github.com/jjrocks/jjs-website
Fixed a few bugs. Put mores stuff in the global configuration
Fixed a merge problem
New bug introduced: Project header hight is 0px
Switched to a header tag instead. Exploded code. Working on fixes
I decided that switching to header only made my life worse
Yup more shenanigans
Site almost ready to go. Just needs a little more information here and there.
Merge pull request #1 from jjrocks/master

Testing out online pmerging.