Added changing to prop
Merge remote-tracking branch 'origin/master'

Conflicts:
	gamemode/server/server_init.lua