added requesting and accepting friendship functionality
Merge branch 'master' into accepting_friends

Conflicts:
	app/controllers.rb
	app/models/member.rb
Merge pull request #6 from tiger-swallowtails-2013/accepting_friends

added requesting and accepting friendship functionality