Weapon Basics

The start of how the weapon will be implemented to kill the ghost. I'll
commit the rest soon
Merge Conflict Corrections
More Merge Conflict Corrections
Merge remote-tracking branch 'origin/master'

Conflicts:
	TheBasics/src/edu/virginia/cs2110/rc4sv/thebasics/objects/Entity.java