first commit
Merge branch 'master' of https://github.com/ichbinedgar/llevametaxi

Conflicts:
	.gitignore