Merge branch 'master' of github.com:christianbundy/erowid-research-project