Commit.. not sure why not working
Merge branch 'master' of https://github.com/cortezo/etsydemo

Conflicts:
	app/views/layouts/application.html.erb