Settings Fixed
Merge branch 'master' of https://github.com/Spinnk/Robot-Murder-Investigation