login
Merge branch 'master' of https://github.com/NightBrownie/itechart.connect

Conflicts:
	app.js