.
Merge branch 'master' of https://github.com/pboechat/MexicanStandOff

Conflicts:
	MexicanStandOff.userprefs
Merge branch 'master' of https://github.com/pboechat/MexicanStandOff

Conflicts:
	MexicanStandOff.userprefs