Almost done adding hand. Fuck the haters
Merge remote-tracking branch 'origin/master'

Conflicts:
	App/App.iml
	App/project.properties