fromdos fix
Merge branch 'master' of https://github.com/RNK-developer1/theSeller

Conflicts:
	assets/style.css