untrack this
Merge branch 'master' of
https://github.com/tprovoost/MicroManagerForIcy.git

Conflicts:
	MicromanagerPlugin/.classpath