fixed merge conflicts for egg.html
changed merge conflicts for local master branch
making home page
Merge branch 'master' of https://github.com/red-admirals-2014/littlepooper into home_page
Merge branch 'master' of https://github.com/red-admirals-2014/littlepooper into home_page
created HomePage framework
added background image to home page
merge errors fixed
Merge pull request #21 from red-admirals-2014/home_page

Home page