installed the module for passport which will be needed in order to make the login work.
committing registerctrl again, for some reason.
Merge branch 'martin_workbranch'
Merge branch 'martin_loginwork' into martin_workbranch

Conflicts:
	node_modules/passport-local/LICENSE
	node_modules/passport-local/package.json
	node_modules/passport/LICENSE
	node_modules/passport/README.md
	node_modules/passport/package.json