Tidying Up
Merge branch 'master' of https://github.com/inf1-op-2012-group2/DuckHunt.git