populated picker tableview
added buttons storyboard
merging
resolved merge conflicts
Merge branch 'master' of https://github.com/benbueltmann/AlarMock

Conflicts:
	AlarMock/Base.lproj/Main.storyboard
	AlarMock/TableViewController.m
new merge