Alex was here again
Alex was here again
Merge branch 'master' of https://github.com/aroduribe/iLife

Conflicts:
	iLife.xcodeproj/project.pbxproj