added duckType and getters and setters to duck
Made debug statements informative and started on drawDucks function
resolved merge conflict in game.cpp
Began implementing drawDucks. Ducks only actually redraw every 15 frames
Merge branch 'master' of github.com:Dillonb/DuckHaunt