Store users when login
Add user and image
Merge branch 'master' of github.com:streamslide/cookpad-contest

Conflicts:
	app/views/home/timeline.html.erb