rake edit
Merge branch 'master' into game_logic
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
bug fixed in battle.js, results now return true and false. basic user controller refactoring
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
methods to calculate statistics and create posts based on statistics
merged master with itself
merged from master
Merge branch 'master' into BattleLogic
deleted p statementes
Merge pull request #42 from pocket-gophers-2014/BattleLogic

Battle logic