changes to derby log?
Merge remote-tracking branch 'Alana/master'

Conflicts:
	BuzzMateWebService/derby.log
Added some Friends stuff