Added Battery

Battery still needs to recharge the batteryLife. batteryLife still needs
to be made into world.
Merge remote-tracking branch 'origin/master'

Conflicts:
	GhostHunter17/src/edu/virginia/cs2110/ghosthunter17/World.java