Merge pull request #48 from amelialaundy/dev_branch

Dev branch
Merge pull request #51 from amelialaundy/dev_branch

Dev branch
changed player markers-now it's obvious if you're the bunny
made migration file to remove nunm_players column from game
removed all num_players references
no more pesky num_players column/field! (works fine)
tidied up gamescontroller with smaller private methods
tidied up rabbit and player controllers to have smaller methods
added bouncing powerup box asset
cleaned up num_players (found some that shouldn't have been there)
refectored gamescontroller tests
finished refactoring gameController and tests
finsished refactoring gamecontroller tests, now onto players_controller and tests
deleting commented out code
Added some controller tests, some difficulty with playerController_spec.rb
Adding tests to rabbit controller
Merge branch 'adam_refactor' of https://github.com/amelialaundy/runRabbitRun into adam_refactor
merge adam with devbranch
merging in prox_ui
removing left over merge conflicts