update on run()
Merge remote-tracking branch 'origin/master'

Conflicts:
	LastManStanding/LastManStanding/scripts/objects.js