changed file for heroku only
postgresql
source
changed
change again
pg
update README with heroku deploy
fix the problem of login
update the readme
Merge branch 'master' into production
update gem
Merge branch 'master' of github.com:mistbow/cms_6bey into production
update gem
fix the bootstrap problem
fix strap
Merge to lastest code
add update user info page
Merge pull request #28 from songjiayang/master

完成了deal详情页展示
Merge pull request #29 from Ailenswpu/master

add rails_admin
added two tmp file