James Harkins update 5/24/14
Merge branch 'master' of https://github.com/jgavin/donkeykongproject