Merge branch 'master' of https://github.com/mud-turtles-2014/wine-tasting
Change united states in correct_answers to match user_results
Merge branch 'country_formatting'
Merge branch 'master' of https://github.com/mud-turtles-2014/wine-tasting