test check-in
Merge remote-tracking branch 'origin/shane-check-in-test'

Conflicts:
	friends/forms.pyc
	friends/models.pyc
	friends/urls.pyc
	friends/views.pyc
	friendship/settings.pyc
	friendship/sqlite3.db
ignore and delete pyc files and .idea folder
fixed import