added styling to second page
added new rabbit marker style
tweak a little bit in UI and markers not showing
map and street view are side to side, update some ui stuff (bg,margins,colors)
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
added 2nd ui page and win modal window
merge with dev_branch
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
update new game input form & reduced button size
mergw with dev_branch
changed new html file, trying to merge in dev branch
Merge pull request #46 from amelialaundy/proximity_ui

update new game input form & reduced button size