redone gitignore
test push for dev
Merge branch 'master' into dev

Conflicts:
	AmiHuntAndroid/res/values/strings.xml
Merge pull request #1 from nycodes9/master

change edit test
Delete AndroidManifest.xml
Delete R.txt
Merge pull request #2 from nycodes9/dev

Dev