Modified   app/index.html
Modified   app/scripts/app.js
Merge branch 'master' of https://github.com/tuyetle/Q-A-Platform

Conflicts:
	app/scripts/app.js