Merge remote-tracking branch 'origin/jennifer' into merge_test

Conflicts:
	app/views/users/show.html.erb
updated my account link
Merge branch 'master' into merge_test

Conflicts:
	app/views/users/show.html.erb