Merge branch 'gh-pages' of https://github.com/sdeguardi/MedSys into gh-pages

Conflicts:
	css/main.css
	img/logoalt.png
	img/logoalt500.png
	index.html