futzing around removing the sidebar
Merge branch 'master' of https://github.com/redaikidoka/Sistema

Conflicts:
	css/sistema.css