Question and answer page updated
Answers
Merge branch 'master' of https://github.com/ishg/Team12

Conflicts:
	public/left-sidebar.html