products view edited
Merge branch 'master' of https://github.com/wIksS/OnlineStore

Conflicts:
	public/css/site.css