Initial commit
Second commit to sync with github
Merge branch 'master' of https://github.com/Christopotamus/roguezombies
Necessary to merge github with local branch