Initial commit
resolve some conflicts
Merge branch 'develop' of https://github.com/ScottBuchanan/DontEatHere into develop
update gitignore