fixed merge issue
Merge pull request #7 from keeronmarc/issueTHINGS-got-SCREWED

fixed merge issue
Updated Index from Joe
adding sliding action for beer matches
merging master into beer-slider
most slider functionality finished.
Merge pull request #9 from keeronmarc/beer-slider

adding beer slide-style presentation
commits to specs, butn
lastest updates
main commits