Added new file app/models/user.rb
Merge branch 'master' of https://github.com/xichuanglian/evaluation_system
Added migration CreateUsers

Conflicts:
	app/models/user.rb