settings added
Merge branch 'master' of https://github.com/gusly514/hungergame