Merge head
Trying to merge
Merge branch 'master' of https://github.com/loopyz/spontaneity

Conflicts:
	Spontaneity/.DS_Store
	Spontaneity/Spontaneity.xcodeproj/project.pbxproj
	Spontaneity/Spontaneity.xcodeproj/project.xcworkspace/xcuserdata/Angela.xcuserdatad/UserInterfaceState.xcuserstate
	Spontaneity/Spontaneity/AppDelegate.m
	Spontaneity/Spontaneity/images/backgrounds/create-bg@2x.png