init
Merge branch 'master' of https://github.com/elartix/testandrapp

Conflicts:
	.gitignore