add login
Merge branch 'master' of https://github.com/amni/RISC

Conflicts:
	models.py
	static/css/bootstrap.css