friends are linked via primary key
sidebar looks fancy, not working though
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/socnet/base.html
Merge branch 'master' of /Users/anton/PycharmProjects/social_network with conflicts.
Recommiting all changes