updated equals
Merge branch 'jake' of https://github.com/jacoblwright/hit into jake

Conflicts:
	src/model/Container.java
current solution builds
updated code
Merge branch 'jake' of https://github.com/jacoblwright/hit into andy
Message
Adding File for Nick