final touches
fixing merge conflicts

Merge branch 'master' of github.com:shanawho/colors

Conflicts:
	style.css