two buttons added
added third and properties
Merge branch 'buttons'

Conflicts:
	Test/Test.xcodeproj/project.xcworkspace/xcuserdata/pawelsporysz.xcuserdatad/UserInterfaceState.xcuserstate
	Test/Test/Base.lproj/Main.storyboard
	Test/Test/ViewController.m