eod
Merge branch 'master' of https://github.com/koruyogesh/Merging-files

Conflicts:
	css/custom.css