#ch-18 work 4h
Merge branch 'master' of https://github.com/KernelCorp/cakehouse

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/homepage/index.html.haml
#ch-18 work 4h
Merge branch 'master' of https://github.com/KernelCorp/cakehouse
#ch-18 work 8h
#ch-18 fixed work 5h
Merge branch 'master' of https://github.com/KernelCorp/cakehouse

Conflicts:
	Gemfile
	app/assets/stylesheets/lib/homepage.css.sass
	app/views/homepage/index.html.haml
merge conflicts are fixed
Merge branch 'master' of https://github.com/KernelCorp/cakehouse
placeholder for photo is added