Small tweaks
Merge branch 'master' of https://github.com/thewebcraftsmen/TWC-Ellis

Conflicts:
	assets/css/main.css
	assets/less/_modules.less