login works now
registration works now
Merge branch 'master' of https://github.com/zimolo/release0

Conflicts:
	app.js
Merge branch 'master' of https://github.com/zimolo/release0

Conflicts:
	app.js