Database
Merge branch 'master' of https://github.com/tonjeb/Assignment2

Conflicts:
	bin/AndroidManifest.xml
	bin/FunRun.apk
	bin/classes.dex
	bin/resources.ap_