Removed DB info
Updates to site that weren't made in Git
Merge branch 'master' of https://github.com/elizuck/circulate

Conflicts:
	conDB.php