不知道怎么说
？
Merge branch 'master' of https://github.com/wanzysky/HotReg

Conflicts:
	.idea/dataSources.xml
	.idea/runConfigurations/Development__HotReg.xml
	.idea/workspace.xml
	app/views/users/new.html.erb