heroku
merge conflicts
Set up a basic html and css framework for Britt to work on later
Merge branch 'master' of https://github.com/fiery-skippers-2014/its-nacho-problem
Merge branch 'master' into html_setup
Merge pull request #13 from fiery-skippers-2014/html_setup

Html setup