sjdknvkjsd
Profile design
Merge branch 'master' of https://github.com/azntango/Dog_app

Conflicts:
	app/views/users/show.html.erb
Fix merge text