in-progress updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	medication-list/index.html
	timeline/index.html