homepage v1 done, correction on the container to adapt to the design
Merge branch 'master' of https://github.com/becker-g/my-memoirs

Conflicts:
	Gemfile.lock
	app/views/users/edit.html.erb
	app/views/users/index.html.erb
	app/views/users/new.html.erb
	log/development.log