Better config loading but worse efficiency
Merge branch 'master' of github.com:Sammidysam/7dRTS

Conflicts:
	src/main.c