layout for user
Merge branch 'master' of https://github.com/petrachi/home_made_art

Conflicts:
	Gemfile.lock
Merge branch 'master' of https://github.com/petrachi/home_made_art