- Added a run class
Merge remote-tracking branch 'origin/master'

Conflicts:
	Trips/Trips.iml
	Trips/backend/backend.iml
	Trips/web/web.iml
- Added a run class