ignoring ds_store files
Merge branch 'master' of github.com:story-makers/AndroidProject
fixing project properties
project.properties is now ignored