Merge pull request #1 from hoanguyen311/master

New pull request
Modified   app/scripts/controllers/question-list-controller.js
Modified   app/scripts/services.js
Merge branch 'master' of github.com:hoanguyen311/Q-A-Platform
Merge pull request #2 from hoanguyen311/master

Move data to services.js
Merge pull request #5 from tuyetle/master

Merge pull request #1 from hoanguyen311/master
Merge pull request #2 from hoanguyen311/master

Update Project from other contributers
Modified   app/index.html
Modified   app/scripts/app.js
Merge branch 'master' of https://github.com/tuyetle/Q-A-Platform

Conflicts:
	app/scripts/app.js
Modified   app/scripts/app.js
Modified   app/scripts/controllers/question-list-controller.js
Merge pull request #6 from tuyetle/master

Adding category list
Merge pull request #7 from thaodta/master

Merge pull request #2 from hoanguyen311/master
Modified   app/index.html
Modified   app/scripts/app.js
Modified   app/scripts/controllers/question-list-controller.js
Modified   app/scripts/services.js
Merge branch 'master' of github.com:hoanguyen311/Q-A-Platform
Merge branch 'master' of github.com:thaodta/Q-A-Platform into thaodta-master

Conflicts:
	app/scripts/controllers/question-list-controller.js
Merge branch 'thaodta-master'
Modified   app/index.html
Modified   app/scripts/controllers/question-list-controller.js
Modified   app/views/ask-question.html
tuyen test
Merge pull request #9 from tuyencao/master

Update
Modified   app/scripts/services.js
Merge branch 'master' of github.com:hoanguyen311/Q-A-Platform