moved file
added basic front-end logic
Merge remote-tracking branch 'origin/master'

Conflicts:
	template/registration.html
Merge remote-tracking branch 'origin/master'