createtrip
createTrip jade file
trip update
Trying to get files to work
With createTrip page done
Merge branch 'master' of https://github.com/mstagitis/Tripster.git

Conflicts:
	MyAppNode/app.js
	MyAppNode/routes/trip.js
	MyAppNode/views/profile.jade
	MyAppNode/views/trip.jade