added logo and fields for user to add their own item
Merge branch 'master' of https://github.com/dancingshell/MixnMatch

Conflicts:
	config/routes.rb