tom

tom
Merge branch 'master' of https://github.com/NicklasSlagbrand/DesignProjekt

Conflicts:
	bin/DesignProjekt.apk
	bin/classes.dex