no message
Merge branch 'master' of https://github.com/ShoppingScout/ShoppingScout

Conflicts:
	Assets/Main.cs
Merge branch 'master' of https://github.com/ShoppingScout/ShoppingScout