updated
Merge branch 'gh-pages' of https://github.com/emdsgn/dps-original into gh-pages

Conflicts:
	index.html
	medical.html