tes
Merge branch 'omOss' of https://github.com/BeerDev/iOSapp into omOss

Conflicts:
	.gitignore