add some entries to the gitignore that people keep adding and trying to get me to pull
remove trash files
Merge branch 'master' of github.com:jpouellet/ece2524-game into cam
update readme for shell-wrapper to describe level directory structure
make the makefile use implicit rules
Merge branch 'master' of github.com:jpouellet/ece2524-game
Merge pull request #6 from yousbj/master

Submission after handling collisions
Merge branch 'master' of github.com:jpouellet/ece2524-game
Compilable