Re-enter merlot and add country and grape to missing white
Merge pull request #81 from mud-turtles-2014/tasting_feedback

Re-enter merlot and add country and grape to missing white
Remove extra tabs
Change to splash styling
Remove TODO comment
Change homepage container height to auto
Add styling to snippets
Add start of a footer
Fix indentation
Merge branch 'master' into homepage_rearrange
Add get_feedback_hash method
Display tips for improving observations
Merge pull request #82 from mud-turtles-2014/homepage_rearrange

Homepage rearrange
Merge branch 'master' of https://github.com/mud-turtles-2014/wine-tasting
Change united states in correct_answers to match user_results
Merge branch 'master' into charts
Basic chart viewable browser and mobile