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

Conflicts:
	.settings/com.powerflasher.fdt.classpath