Merge branch 'master' of https://github.com/joshjens/spotsearch-tutorial
Merge branch 'master' of https://github.com/joshjens/spotsearch-tutorial