blah
friendships
Merge remote-tracking branch 'origin/dev' into feature/bestbuy

Conflicts:
	app/views/stores/index.html.erb
	app/views/users/index.html.erb
Friendship attempts
Merge branch 'feature/bestbuy' into dev