adding new color
Merge branch 'master' of https://github.com/LuisGit/phaseit

Conflicts:
	PhraseIt/classes/model/DBManager.m