Added login page and cookie logic
Merge branch 'master' of github.com:Commander147/CS580

Conflicts:
	app.js