user register form
Merge branch 'master' of github.com:redelivre/minka

Conflicts:
	style.css