users selfintro etc added
on the header and purpose added
conflict is fixed
around user is changed
Merge pull request #29 from matcho3/trip

Trip