no message
Merge branch 'master' of github.com:Ashton-W/ColorPal

Conflicts:
	ColorPal.xcodeproj/project.pbxproj
	Podfile
	Podfile.lock
	Pods/Manifest.lock
	Pods/Pods-acknowledgements.markdown
	Pods/Pods-acknowledgements.plist
	Pods/Pods-environment.h
	Pods/Pods.xcconfig
	Pods/Pods.xcodeproj/project.pbxproj
no message