Comments should no longer be displayed twice
Merge branch 'master' of https://github.com/rolland0/Team6_CSC280_Lab

Conflicts:
	Project/Project/WebContent/WEB-INF/tags/commentTemplate.tag
Merge branch 'master' of https://github.com/rolland0/Team6_CSC280_Lab