Merge branch 'master' of https://github.com/dluyllong/Q-A-Platform
Merge branch 'master' of https://github.com/dluyllong/Q-A-Platform

Conflicts:
	app/views/question-details.html