stars
Merge branch 'master' of https://github.com/dietoff/philipsCluster

Conflicts:
	src/applets/ScanImage.java
Merge branch 'master' of https://github.com/dietoff/philipsCluster

Conflicts:
	src/applets/ScanImage.java