fixed some git issues, added documentManagerTest.java
Merge branch 'master' of https://github.com/Lambwatt/SEng426Part4