Merge branch 'master' of github.com:perfeoart/furniture_store

Conflicts:
	README.md
Merge branch 'master' of github.com:perfeoart/furniture_store
Merge branch 'master' of github.com:perfeoart/furniture_store