Battle Widget
cookies to store sessions on login, signup, and signout
Merge pull request #29 from pocket-gophers-2014/cookies

cookies to store sessions on login, signup, and signout
Merge pull request #30 from pocket-gophers-2014/game_logic

Game logic
adds polling
merge conflicts
Update users_controller.rb
Merge pull request #31 from pocket-gophers-2014/polling

Polling
random commit
merge conflictsj
pulls out start and stop polling and adds bugfixes
fixes merge
Merge pull request #32 from pocket-gophers-2014/polling

Polling
name field in migration, name and telephone field in form with placeholders, attr accessible in user model, basic styling
settled merge conflict
removes an s from a method name
Merge pull request #33 from pocket-gophers-2014/singup_phone_name_fields

Singup phone name fields
Testing heroku scheduler