added settings folder to assests
x
x
updated apache conf
x
added in the old pessto.org website to the document root
installing and fixing pessto.org on VM01
removed database credentials from github
removed database credentials from github
installing and fixing pessto.org on VM01
installing and fixing pessto.org on VM01
x
Merge branch 'refs/heads/master' into dev

Conflicts:
	htdocs/assets/.sass-cache/54e8aec16dd2a4e4ee2f61cba5b834b089effdaf/_default_variables.scssc