Merge pull request #2 from ethosrot/master

Please pull and merge for great justice.
Add cupid for great debugging justice
Merge pull request #3 from pib/master

Add cupid for great debugging justice
Remove freeze/unfree on Character objects.
Merge branch 'master' of github.com:jwiggins/ggj
Move faster. Stay in bounds.
updated collision map