fixed deleting friends
Merge branch 'master' of github.com:joelbrady/unswfingr

Conflicts:
	main/views.py