Remove swp files and etc
Merge branch 'master' of https://github.com/juretaka/Test

Conflicts:
	.QuantityTester.java.swp
	.UnicalcTester.java.swp
Adds Quantity.java with stub methods
Merge branch 'master' of https://github.com/juretaka/Test