*debugged collision (for now(?))
*added debugging constants
Merge branch 'master' of https://github.com/annsimon/candyland