localcommit
Merge branch 'master' of https://github.com/mstagitis/Tripster.git

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