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

Conflicts:
	test.txt
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
Modified   app/index.html
Modified   app/scripts/app.js
Modified   app/scripts/controllers/question-list-controller.js
Modified   app/scripts/services.js
Modified   app/views/questions-list.html
Modified   app/index.html
Modified   app/scripts/app.js
Modified   app/scripts/controllers/question-list-controller.js
Modified   app/scripts/services.js
Modified   app/views/questions-list.html
Modified   app/index.html
Modified   app/scripts/app.js
Modified   app/views/ask-question.html
Modified   app/views/ask-question.html
Merge pull request #6 from hoanguyen311/master

Update data