Committing so I can pull
Merge branch 'master' of https://github.com/john098/HCFTW

Conflicts:
	app/src/main/AndroidManifest.xml