next version of the wristband prototype
conflict commit
Merge branch 'master' of github.com:Jugendhackt/awearness

Conflicts:
	design/awaernessarmband1.2_rendering2.blend