Working on variables inside of the game settings stuff
Merge branch 'master' of https://github.com/starbuck93/massive-dangerzone

Conflicts:
	main.lua
	startGame.lua

Work done in class, merged, lots of variables fixed and it looks better
now. Other cool stuff happened, too.