q#	new file:   bin/classes/com/example/shooter/MyGLSurface$CustomHandler.class
Merge branch 'master' of https://github.com/cszh222/CS335FinalProj
reset game and load replay params
merge error