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