merge users file to user and tracks file to track
Merge branch 'master' of https://github.com/eladdo92/tripbook

Conflicts:
	DAL/user.js