Added equals method
Merge branch 'master' of https://github.com/kevinchian/Project3

Conflicts:
	src/Tray.java