gitignore local.properties
Merge branch 'master' of https://github.com/anhkim/wastelands_demo