test
fix
Merge branch 'master' of https://github.com/iOSTeamJarek/biTaKa

Conflicts:
	.DS_Store