Android studio file changes
Gitignore
Some file changes
Merge pull request #1 from james2388/Test

Test to master
Update codeStyleSettings.xml
Merge branch 'master' into development