init commit
Merge branch 'master' of https://github.com/abbadoh/AndroidApplication

Conflicts:
	.gitignore