creating an energy a room
Merge branch 'master' into energy
adding energy in the EnergyRoom

modified:   src/environment/room/EnergyRoom.java