JLP
Merge branch 'master' of https://github.com/Florry/webshopProject.git

Conflicts:
	.gitignore