fucing ignoring
fuck twice
Merge branch 'master' of https://github.com/McBodik/Taxi

Conflicts:
	Taxi-desktop/bin/.gitignore
	Taxi/bin/.gitignore