stuff
Merge branch 'gamecontroller2' of https://github.com/icarreras/OOP into gamecontroller2

Conflicts:
	BusinessSim/src/com/game/businesssim/Business.java
	BusinessSim/src/com/game/businesssim/GameControllerActivity.java
end