GameObjects serilizing
woops
Merge branch 'sebastian'

Conflicts:
	grief/grief/DisapearingPlatform.h
	grief/grief/map.txt