Merge pull request #1 from JasonGuanGitHub/master

update branch of jitongming from master
update welcome/controller/validates /login

update welcome/controller/validates /login
update instrument controller

在instrument页面里的最后params添加了一个fee_per_hour字段
更新instrument/_form.html.erb

添加了fee_per_hour字段
更新instrument/show.html.erb

添加了fee_per_hour字段
更新instrument/index.html.erb

添加fee_per_hour字段
添加了一个计费方式fee_per_hour

添加了一个计费方式fee_per_hour
Merge pull request #42 from jitongming/master

update welcome/controller/validates/login
在仪器详情和预约表页面展示仪器的单价