update gitignore for Android Studio
Merge branch 'master' of github.com:asilyihong/Escape

Conflicts:
	.gitignore