should be deleted. Git failed
Merge branch 'master' of https://github.com/Jasperste/Simulator.git