new branch
3 tests to cover entire code now pass
added Usd UserBuilder to test classes
added isFriendsWith method to User using tests
tripservice refactored a bit, next step: inject logged user and tripTAO
passed in a loggedinuser as a parameter
passed through TripDAO into the constructor for TripService
fixed one test
Merge branch 'practice1'
resolved conflicts, time to merge