added equals() to most entities
Merge branch 'testKuan' of https://github.com/KuanSheng/CS509_CyberPoemSlam into testKuan