Fixed syntax, formatting

Fixed syntax and formatting in Player, Container, and Location
Merge remote-tracking branch 'origin/master'

Conflicts:
	Locations/Location.java