testconflict2
Merge branch 'master' of https://github.com/BBAA/BB

Conflicts:
	Bottle Booking/Base.lproj/Main.storyboard
test