added initial equals and hashCode methods
Merge pull request #4 from ericvangelder/Develop

added initial equals and hashCode methods
Merged Eric's and my code