Final code commit
Merge branch 'master' of https://github.com/pamela123/272-Project

Conflicts:
	272_StackExchange/WebContent/View/CategoryOverview.jsp
	272_StackExchange/WebContent/View/FavouriteQuestions.jsp
	272_StackExchange/src/Servlets/CategoryOverview.java
	272_StackExchange/src/Servlets/FavouriteQuestions.java