Changed formatting
Merge branch 'master' of https://github.com/strangerloops/memento

Conflicts:
	Memento/Memento.xcodeproj/project.xcworkspace/xcuserdata/michaelhassin.xcuserdatad/UserInterfaceState.xcuserstate
Merge branch 'master' of https://github.com/strangerloops/memento