latest code
prepare for merge
prepare for merge
commiting before pulling from andy to finish up testing for item and item manager
removed coverage-reports and changed .gitignore to not include again
Merge branch 'andy' of https://github.com/jacoblwright/hit into nick

Conflicts:
	test-src/model/ItemManagerTest.java
latest
updated again

Merge branch 'nick' of https://github.com/jacoblwright/hit into jake
fixed merge conflicts
Merge branch 'jake' of https://github.com/jacoblwright/hit into nick
worked on SerializerTest with toString
push after pulling from jake, successfulbuild
deleting report stuff
prepare for pull
finished editor impl
prep
build successfull with commons io lib
maybe fixed build file
prep
Merge branch 'nick' of https://github.com/jacoblwright/hit into evan