Two new options
Merge branch 'master' of https://github.com/tyguy550/GunGame

Conflicts:
	gamemode/settings.lua