fixing merger conflict'
Merge branch 'master' of github.com:LaunchAcademy/coffee_filter
Fixed changes
Merge pull request #12 from LaunchAcademy/index_test

RFR
Merge branch 'master' of github.com:LaunchAcademy/coffee_filter
Fixed merge conflicts