Removed .gitignore
Added a settings activity
bin files
Merge branch 'master' of https://github.com/scherfan/cmput301_asn1