CSS change feel free to erase this
Merge branch 'master' of github.com:artvandelay982/weave

Conflicts:
	public/css/templateStyles2.css