Merge branch 'master' of https://github.com/Mylonymus/BuyMe

Conflicts:
	index.html
-