update primary color back to green
Merge branch 'master' into dev

Conflicts:
	css/style.css