profile page is styled!
Merge branch 'master' of github.com:zhbanton/photo_mixer into styling

Conflicts:
	app/views/profile/show.html.erb
Merge pull request #42 from zhbanton/styling

profile page is styled!