a
Seriously fixed merge conflicts now
Merge branch 'master' of https://github.com/benbueltmann/AlarMock

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