couple small changes
Merge branch 'master' of git@github.com:pmanko2/512_project.git

Conflicts:
	src/ResImpl/ResourceManagerImpl.java