Debugging stuff
Merge branch 'master' of github.com:rolland0/Team6_CSC280_Lab

Conflicts:
	Project/Project/src/servlets/DeleteComment.java
	Project/Project/src/servlets/DeletePost.java
UserProfile no longer shoves dead data back into the database