dum commit. github is forcing me.

This commit only changes R, so it does not affect the project
Merge branch 'master' of https://github.com/icarreras/OOP

Conflicts:
	BusinessSim/gen/com/game/businesssim/R.java