Added Hate and Sadness to the project (proofed for Checkstyles/FindBugs/PMD - needs a bit more PMD work, but only for extra credit, and Javadocs)
Merge branch 'master' of https://github.com/stephanwilliams/CS-2340-Project

Conflicts:
	src/com/team19/cs2340/finance/LocalFinanceDataService.java
	src/com/team19/cs2340/user/LocalUserAccountService.java