And sometimes regexs are not a panacea kids...
Merge branch 'master' of github.com:ppannuto/M-ulator
Merge branch 'master' of github.com:ppannuto/M-ulator

Conflicts:
	platforms/m3_ctl/programming/ice.py