update
Merge branch 'master' of https://github.com/neeemo/MobileComputing

Conflicts:
	ButterItSwift.xcodeproj/project.pbxproj