working on login
Merge branch 'master' of https://github.com/ftorghele/swa-betting-system

Conflicts:
	public/js/app.js