some merge fix
Merge branch 'master' of https://github.com/dvmarinoff/project_store

Conflicts:
	public/css/main.css