about
Merge branch 'master' of https://github.com/zzlmilk/Summly
mer

Conflicts:
	Summly.xcodeproj/project.pbxproj
	Summly/Controllers/SetViewController/AboutViewController.h
	Summly/Controllers/SetViewController/AboutViewController.m
merge
Merge branch 'master' of https://github.com/zzlmilk/Summly

Conflicts:
	.DS_Store
	Summly.xcodeproj/project.pbxproj
	Summly.xcodeproj/project.xcworkspace/xcuserdata/zoutsuyu.xcuserdatad/UserInterfaceState.xcuserstate
	Summly/Controllers/.DS_Store
	Summly/Controllers/SummlyListViewController/DetailScrollViewController.m
	Summly/Controllers/SummlyListViewController/SummlyListViewController.m
	Summly/Images/.DS_Store
	Summly/Models/Summly.h
	Summly/Models/Summly.m
a
Merge branch 'master' of https://github.com/zzlmilk/Summly

Conflicts:
	.DS_Store
	Summly.xcodeproj/project.pbxproj
	Summly.xcodeproj/project.xcworkspace/xcuserdata/zoutsuyu.xcuserdatad/UserInterfaceState.xcuserstate
	Summly/Models/Summly.m