Nursing-index changes
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/12sm/depuy

Conflicts:
	css/main.css
Merge branch 'master' of https://github.com/12sm/depuy