marker colors
Merge branch 'master' of
https://github.com/theapurvapawar/cmpe272-team4.git

Conflicts:
	CMPE272/public/views/base.html