this database stuff is raw.
Merge branch 'master' of github.com:walkingtowork/cake_adventure
gitignore conflict fixed
killed index.html in public
actually killed index