Initial commit
Updated gitignore
Merge branch 'master' of https://github.com/AndroidSquad/TestRepo

Conflicts:
	.gitignore
	README.md

tutten