Only friends can be invited to workouts and you cannot add a friend more than once
Merge branch 'master' of https://github.com/JuhaMikkola/fitbyfriday

Conflicts:
	app/views/workouts/index.html.erb