asd
not good
Merge branch 'master' of github.com:panzerfausten/CareMeToo

Conflicts:
	app/app.iml
Merge branch 'master' of github.com:panzerfausten/CareMeToo
Madserge branch 'master' of github.com:panzerfausten/CareMeToo

Conflicts:
	app/app.iml
fixed