db and password
Merge branch 'master' of https://github.com/NightBrownie/itechart.connect

Conflicts:
	public/stylesheets/base.css