test commit,,,,,
每个文件头加入了 # encoding: utf-8
seeds.rb文件去掉了tempUser相关内容
Merge remote-tracking branch 'origin/master'