display pub meds
merge conflict fixed
Merge branch 'master' into potw

Conflicts:
	js/personOfTheWeek.js