lots of debugging
Merge branch 'master' of https://github.com/brando90/Dark-Cloud