FINALIZED

Last change adds a username cookie to get rid of annoying prompt at the start
Merge branch 'master' of heroku.com:jamwithme