Fixed drawing problems
Merge conflict fix
Added barrel stuff
Merged Ricky's changes
Merge branch 'master' of https://github.com/rsingla92/Donkey-Kong into FixSwap