I added some bunnies :)
tried to fix merge conflict
Merge branch 'master' of https://github.com/cornelisonc/MobileAppDevTest

Conflicts:
	file.txt
removed some git added text junk