## Current progress on UpdatePlatform
## Current progress on UpdatePlatform
Merge origin/master

Conflicts:
	src/mice_project/UpdatePlatform.java