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
Merge branch 'master' of github.com:hoanguyen311/Q-A-Platform

Conflicts:
	app/views/questions-list.html