Merge branch 'develop' of github.com:nilesjohnson/conference-list into feature-tags
Merge branch 'feature-tags' into develop