Added equals and hashcode for child projectile classes
Removed unused variable
Merge branch 'Jonte'
Merge branch 'Oskar'