EOD
Merge branch 'master' of https://github.com/koruyogesh/kt-Abremed

Conflicts:
	css/main.css

lk
Merge branch 'master' of https://github.com/koruyogesh/kt-Abremed

Conflicts:
	css/main.css

lk changes