First commit
Merge branch 'master' of https://github.com/dokoto/TaxiMeter

Conflicts:
	.gitignore