Cloned from supermarket
Merge https://github.com/Roviluca/Test

Conflicts:
	LICENSE