minor update
Merge branch 'master' of https://github.com/Catpaw42/Area51.git

Conflicts:
	CDIO_51/src/WeightMain.java