more detailed description
Merge branch 'master' of https://github.com/mulab/hackthon-register

Conflicts:
	static/js/main.js