background global amends
Merge branch 'master' of https://github.com/Trailfinders/rugby

Conflicts:
	public/css/custom.css