rings
Merge branch 'master' of https://github.com/chooper9/cs354r-assignment4

Conflicts:
	GameResource.h~
	libtool