Second commit
Merge branch 'overkap'

Conflicts:
	src/weightapp/Weightapp.java