registeration

registeration is working for new page
Merge remote-tracking branch 'origin/master'

Conflicts:
	war/resources/css/parallax/style.css
	war/resources/html/welcome.jsp