Change styles and hackathon
Merge pull request #35 from cwhite911/master

Updated style.css and hackathon.html