Final commit for the day
Merge remote-tracking branch 'origin/master'

Conflicts:
	Medical Stock Managment/Medical Stock Managment/index.html