Merge branch 'master' of https://github.com/hashtag-ducks/labrats
Merge branch 'tabs' of github.com:hashtag-ducks/labrats into tabs
Tabs switch correctly, correct content displays.