i'm not merging
Merge branch 'master' of
https://github.com/bellyjeans55/objective_fashion.git

Conflicts:
	objective_fashion/src/controller/Controller.java
redoing this
Merge branch 'master' of https://github.com/bellyjeans55/objective_fashion.git