changines`
Merge branch 'master' of github.com:mcasebeer/oregon

Conflicts:
	templates/oregon/css/oregon.css