syncing up with Armin
Merge branch 'master' of github.com:educoder/hunger-games