test

test
Merge branch 'master' of https://github.com/hu-fulp/android-app

Conflicts:
	.gitignore
DOMAIN INCOME added
-

-
Merge branch 'master' of https://github.com/hu-fulp/android-app

Conflicts:
	.gitignore