Temporary commit
Merge branch 'master' of https://github.com/acfloyd/Curveball

Conflicts:
	Curveball.mpf
	source/ps2/ps2_mouse.v.bak
	work/_info
	work/_lib.qdb
	work/_lib1_1.qdb
	work/_lib1_1.qpg
Removing .bak file