adding in settings view controller
Merge branch 'master' of https://github.com/rileynat/DrinkingGame
Accidental merge