Merge pull request #5 from hoanguyen311/master

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

Conflicts:
	app/scripts/services.js
Modified   app/scripts/services.js