wheel motor number changes
more ignores
Merge branch 'master' into moarmodular

Conflicts:
	.gitignore