finish the sign up pages
udpate rails to 3.2.13 haml
Merge pull request #5 from hlee/master

update to rails 3.2.13
Merge pull request #4 from Youngv/master

完成了注册功能，但是登录有点问题
merge conflict
database.yml.example DRY
Merge remote-tracking branch 'upstream/master'
Merge pull request #10 from Ailenswpu/master

update database.yml.example to DRY
Thanks
changed layout to add admin login
Added one more model of admin
Removed public/index and change the first page to users/list
added a controller of tession accoding to session
Merge branch 'master' of github.com:mistbow/cms_6bey
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