EOD
Merge branch 'master' of https://github.com/koruyogesh/ims

Conflicts:
	css/custom.css
	index.html