final ytouches
no idea
Merge branch 'master' of github.com:baardev/barakaMobile

Conflicts:
	nbproject/private/private.properties
	www/index.html
git fuckup