Ignore this
Merge branch 'master' of https://github.com/awilmot19/clockator

Conflicts:
	clockator/Base.lproj/Main_iPhone.storyboard
Merge branch 'master' of https://github.com/awilmot19/clockator