Bad things, needs reverting
Merge branch 'master' of https://github.com/neeemo/MobileComputingLab

Conflicts:
	ButterIt/Main.storyboard