Conflicts:
	src/bagawareapp/BagAwareApp.java