Uncommented Apriory
Merge branch 'master' of https://github.com/madsxp/DM-GROUP-PROJECT

Conflicts:
	src/app/App.java