Added golden-ratio and rainbow parethesis
Merge branch 'work'

Conflicts:
	.emacs
Unified Style
Update README.md