Added some changes to rmos package
Merge branch 'master' of https://github.com/bronco302/recyclingproject

Conflicts:
	RecyclingProject/src/rcm/RecyclingMachine.java