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

Conflicts:
	biTaKa/.DS_Store
	biTaKa/ViewControllers/ItemTableViewCell.m
	biTaKa/ViewControllers/MainAdViewController.m
	biTaKa/ViewControllers/ViewController.m
	biTaKa/biTaKa/Main.storyboard
Merge branch 'master' of https://github.com/iOSTeamJarek/biTaKa

Conflicts:
	biTaKa/.DS_Store
	biTaKa/ViewControllers/ItemTableViewCell.m
	biTaKa/ViewControllers/MainAdViewController.m
	biTaKa/ViewControllers/ViewController.m
	biTaKa/biTaKa/Main.storyboard