Test background

placeholder graphics were added to the first room, invisible walls were
added
Merge remote-tracking branch 'origin/master'

Conflicts:
	objects/obj_char.object.gmx
	objects/obj_wall_invisible.object.gmx
	rooms/rm_game.room.gmx
Merge remote-tracking branch 'origin/master'

Conflicts:
	Mullican_Manor.project.gmx
	objects/cont_game.object.gmx
	objects/obj_char.object.gmx
	objects/obj_wall_invisible.object.gmx
	rooms/rm_game.room.gmx
	scripts/camera_follow.gml
	scripts/scr_preloader.gml
Merge remote-tracking branch 'origin/master'

Conflicts:
	Mullican_Manor.project.gmx
	objects/cont_game.object.gmx
	objects/obj_char.object.gmx
	objects/obj_wall_invisible.object.gmx
	rooms/rm_game.room.gmx
	scripts/camera_follow.gml
	scripts/scr_preloader.gml