Merge branch 'bug_fixes' of github.com:LaunchAcademy/south_park_reviews into bug_fixes