Merge branch 'master' of https://github.com/FYSTeam2/BagAwareFinal

Conflicts:
	src/bagawareapp/BagAwareApp.java