my initial commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	reg-sys/src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml
erb xml changed somehow
Merge branch 'master' of https://github.com/aleksanyan/registration-system