c
b
Merge branch 'master' of https://github.com/852719/MCode

Conflicts:
	MobileCode/MobileCode/Base.lproj/Main.storyboard
	MobileCode/MobileCode/ViewController.m
1.2.2