flash error messages appear on failed signin
Merge branch 'master' into singup_phone_name_fields
Merge pull request #34 from pocket-gophers-2014/singup_phone_name_fields

Singup phone name fields
Testing heroku scheduler
Merge pull request #35 from pocket-gophers-2014/game_logic

Testing heroku scheduler
rake edit
Merge branch 'master' into game_logic
homepage redirects to user profile if cookie is stored on computer
Merge pull request #37 from pocket-gophers-2014/homepage_css

homepage redirects to user profile if cookie is stored on computer
Merge branch 'BattleLogic' of https://github.com/pocket-gophers-2014/zombify
MVP scheduled events, not yet dependent on humans completing prior task, assumes humans succeed
adds rules lightbox and meta-tag for phone viewing
Merge pull request #38 from pocket-gophers-2014/game_logic

Game logic
Merge branch 'master' into rules
Merge pull request #39 from pocket-gophers-2014/rules

Rules
adds both messages to feed
Merge pull request #40 from pocket-gophers-2014/feed

adds both messages to feed
adds minor styling fixes to the rules popup
Merge pull request #41 from pocket-gophers-2014/rules

adds minor styling fixes to the rules popup
merged master with itself