ready for heroku
Merge branch 'master' of https://github.com/bmcd87/puzzlefight into scalable
getting there