This is my attempt to commit the local repository.
Merge branch 'master' of github.com:philippe-patenaude/BunnyCatcher

Conflicts:
	bin/catcher/StateCatcherGame.class
	src/catcher/StateCatcherGame.java
This is my attempt to commit after the merge.