Updated my code to work with Gils and fixed a bug

There was a logic bug in the code Gil commited, fixed that.

Commented out the settings function until we get round to coding this
screen.

Edited my code to work correctly with the code Gil has written (it is
starting to look like a proper game now).