Added color circles
colors
Merge branch 'master' of https://github.com/soverby/HackathonRev2

Conflicts:
	hackathon/OHMPlanteryView.m