Added some friend related buttons
Merge branch 'master' of https://github.com/Tyler-Kujawa/IS_376_api

Conflicts:
	app/models/user.rb
	app/views/friendships/index.html.erb
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/models/user.rb