Bogus ui.ini commit before deletion
Merge branch 'master' of https://github.com/robrambusch/Trip_Planner.scriv

Conflicts:
	Settings/ui.ini