Making a conflict.
Merge branch 'master' of github.com:P1T4G0R4S/shoppinglist

Conflicts:
	index.html