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

Conflicts:
	src/model/Container.java