code cleanup, bug fixed
Merge remote-tracking branch 'origin/master'

Conflicts:
	localmexes.lua
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Assignments are working