user will only be able to close a dialog box by clicking the 'ok'
button. which means even though they click outside the dialog box, it
should still be visible
Merge remote-tracking branch 'origin/game_controller_bug_fix'

Conflicts:
	BusinessSim/src/com/game/businesssim/GameControllerActivity.java
Merge branch 'master' of https://github.com/icarreras/OOP

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