Objects Addition
Merge remote-tracking branch 'origin/master'

Conflicts:
	pokeslend.gmx/rooms/room2.room.gmx
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 0e737354e194bc7438ed3b1aab5619351a8a911d.
Revert "Objects Addition"

This reverts commit 765ca000b841399f4ccde0f93fcad3ba0b86a7ba.