login
Merge branch 'master' of https://github.com/nokia-wroclaw/hackathon-goidea

Conflicts:
	routers/router.go