Merge remote-tracking branch 'origin/master'

Conflicts:
	research_log.md
Merge remote-tracking branch 'origin/master'

Conflicts:
	research_log.md