wrote presence tests
added (working) jasmine tests to controller spec, testing sendRabbitposition()
got to the point of needing to test pusher...other tests running happily
Merge pull request #37 from amelialaundy/dev_branch

Dev branch
Merge pull request #39 from amelialaundy/dev_branch

Dev branch
added some js to view so we can add different markers, but have some nice placeholders in the meantime:)
unbound keys when player finishes game
Merge pull request #43 from amelialaundy/different_markers

Different markers
Merge pull request #44 from amelialaundy/jasmine_tests_adam

Jasmine tests adam
merging in welcome page branch
mergw with dev_branch