FIXED FRIEND TRIPS FOR SURE
Merge branch 'master' of github.com:britte/CIS450