test
Merge pull request #1 from hydra200238/master

Question Module, Config and Library
add controller and module, change config

add question.php, share.php controller
add question_module.php, share_module.php
change config.php, autoload.php
Merge pull request #2 from hydra200238/master

controller , model
pull from brad
pull from brad
replace all
new News Module

1. add news_model, news_comment_model,news_like_model
2.news controller
Merge remote-tracking branch 'upstream/master'
Merge pull request #4 from diosmio/master

i want to pull you
1. update share.php add function:get_share, insert_share_comment. 2.add file share_comment_model.php
change database password
change database password to root_yunnnyunnn
commit before merge
commit after solving conflict
Merge pull request #5 from TYC12/master

change the database password to TYC's
commit for william chen
i am a fat guy
test
test2