Project finally builds
Merge Hotfix
Merge branch 'master' of https://github.com/rolland0/Team6_CSC280_Lab

Conflicts:
	Project/Project/src/entities/Post.java

git commit