asdasd
added registration controller
added index
added changes
got commit
merge fix
Merge branch 'master' of github.com:AwesomeSoft/TZT

Conflicts:
	.idea/workspace.xml
	src/main/webapp/index.xhtml