friendship it's a magic!
Merge branch 'master' of github.com:clojurecup2014/wishare
get-user-by-id fixed
add-friend
Merge branch 'master' of github.com:clojurecup2014/wishare

Conflicts:
	src/wishare/api.clj