init commit
Merge branch 'master' of github.com:franc90/DispatchRider

Conflicts:
	.gitignore