Progress on home page
Merge branch 'master' of https://github.com/johnnyg12791/spork