rake edit
Merge branch 'master' into game_logic
MVP scheduled events, not yet dependent on humans completing prior task, assumes humans succeed
Merge pull request #38 from pocket-gophers-2014/game_logic

Game logic