minor updates
Merge branch 'master' of https://github.com/shaunus84/who-do-you-trust-ggj14

Conflicts:
	assets/paranoia.tmx
Merge branch 'master' of https://github.com/shaunus84/who-do-you-trust-ggj14