primero commit
Merge branch 'master' of https://github.com/lascar/taxi

Conflicts:
	.gitignore