Modified   app/scripts/services.js
Merge branch 'dluyllong-master'
Modified   app/index.html
Modified   app/styles/custom.css
Modified   app/index.html
Modified   app/scripts/services.js
Modified   app/styles/custom.css
Modified   app/views/questions-list.html
Merge branch 'dluyllong-master'
Merge pull request #5 from hoanguyen311/master

Update
commit feature question
Modified   app/scripts/services.js
Merge branch 'master' of https://github.com/tuyetle/Q-A-Platform into tuyetle

Conflicts:
	app/scripts/services.js
Modified   app/scripts/services.js
Merge pull request #6 from hoanguyen311/master

Update
update question list
Merge pull request #19 from tuyetle/master

update learn more
Modified   app/scripts/filters.js
Modified   app/views/questions-list.html
Modified   app/scripts/services.js
Modified   test.txt
Modified   app/scripts/app.js
Modified   app/scripts/controllers/question-controller.js
Modified   app/scripts/services.js
Modified   app/views/question-details.html
Merge branch 'dluyllong-master'

Conflicts:
	app/index.html
	app/scripts/controllers/question-list-controller.js
	app/scripts/filters.js
	app/scripts/services.js
	app/styles/custom.css
	app/views/questions-list.html
Modified   app/scripts/app.js
Modified   app/scripts/controllers/question-controller.js
Modified   app/scripts/filters.js
Modified   app/scripts/services.js
Modified   app/views/questions-list.html
Merge pull request #17 from dluyllong/master

fix bug ng-model add answer
Merge pull request #4 from hoanguyen311/master

Update