Merge remote-tracking branch 'upstream/master'
fitst commit guide
Merge branch 'master' of github.com:Ailenswpu/cms_6bey
Merge branch 'master' of github.com:Ailenswpu/cms_6bey
Merge branch 'master' of github.com:hlee/cms_6bey
modify First documentation
Edit the First README file
Merge pull request #15 from hlee/master

change the README file
Merge pull request #16 from Youngv/master

Deploy to SinaSAE
Sure thanks for commit
Please update the Sina SAE url to README
gem organize
update README with heroku deploy
change readme add display url
解决了无法登录的bug，并修改bcrypt-ruby的版本
Merge pull request #17 from songjiayang/master

login error had been done 
Great Job
完成首页
Merge pull request #20 from songjiayang/master

完成首页deal瀑布流deal的展现
赞赏一下，有效率
添加首页底部说明
Merge pull request #21 from songjiayang/master

修改了瀑布流页面展示的bug
Fixed bootstrap production problem 1
production css bootstrap 2