JSP1
ignore
ignore 2
Merge branch 'master' of https://github.com/TheNabo1/SmartShoppingServer

Conflicts:
	nbproject/project.properties