remove comments and whitespace
Merge branch 'master' of https://github.com/red-spotted-newts-2014/haunted
Merge branch 'master' of https://github.com/cassiemoy/haunted