Merge pull request #7 from jchnxu/master

添加流写到一半了囧窘炯
Merge pull request #8 from jchnxu/master

人人bug修复完毕，期待用session管理token以增加速度
tx-weibo
Merge branch 'master' of https://github.com/gzc/SNS

Conflicts:
	application/controllers/home.php
	application/views/dashboard_view.php
lalala
哈哈哈
Merge remote-tracking branch 'gzc/master'
人人的流写好了，其它的可以写了