added .gitignore to master - will ignore non c++ or h files, unless its in the resource folder (i think)
Merge branch 'master' of https://github.com/Casket/marsh-game-files
updates to the resources folder, no code
merged my (dylan) branch with master
lost a change to the drawable header, think its fixed now
updates to fix stuff i broke