user registration 1
user registration 2
Merge branch 'master' of github.com:boyuan459/conference

Conflicts:
	src/cms/gui/CmsGUI.java
Master Start