i dont even know
fixed merge conflicts
Merge branch 'friends' of https://github.com/xdothackerx/zoobit into friends
search?
fixed merge conflicts
Merge branch 'master' of https://github.com/xdothackerx/zoobit into addFriends
finished search to add friends
Merge pull request #100 from xdothackerx/addFriends

Add friends