added shoulda, added friendships
changed gitignore