1
Merge branch 'master' of https://github.com/NiallTsao/QuickLink

Conflicts:
	QuickLink.xcodeproj/project.pbxproj