added attribute object
Merge branch 'master' of https://github.com/Ccookkollars/flatWorld

Conflicts:
	FlatDungeonWorld/bin/.gitignore
	FlatDungeonWorld/src/Player.java