Almost finished adding in game Configuration options! ^-^
Merge remote-tracking branch 'origin/master'