Merge pull request #4 from hoanguyen311/master

Update data
cm
Merge pull request #13 from tuyetle/master

update filter category
Merge pull request #14 from tuyetle/master

update
Merge branch 'master' of https://github.com/hoanguyen311/Q-A-Platform into hoanguyen311-master

Conflicts:
	test.txt
Modified   app/index.html
Modified   app/scripts/controllers/question-list-controller.js
Modified   app/scripts/services.js
Modified   app/views/questions-list.html
Added      app/styles/custom.css
Modified   app/index.html
Modified   app/index.html
Modified   app/views/questions-list.html
Modified   app/styles/custom.css
Modified   app/views/questions-list.html
Merge pull request #5 from hoanguyen311/master

Update
Modified   app/index.html
Merge branch 'master' of https://github.com/thaodta/Q-A-Platform

Conflicts:
	app/index.html
Merge branch 'master' of https://github.com/hoanguyen311/Q-A-Platform
Merge pull request #2 from hoanguyen311/master

Update
Modified   app/index.html
Modified   app/scripts/controllers/question-list-controller.js
Modified   app/scripts/services.js
Modified   app/styles/custom.css
Modified   app/views/questions-list.html
Modified   app/views/questions-list.html
question detail
Merge branch 'master' of https://github.com/dluyllong/Q-A-Platform
Merge remote-tracking branch 'remotes/dluyllong/master'

Conflicts:
	app/styles/custom.css
Modified   app/scripts/services.js
Modified   app/styles/custom.css
Modified   app/views/ask-question.html