Create UserTest.java
Fix the Test
Fix test
Add fraction Test
Add DecimalColletionTest
fix java version
Merge branch 'develop-ajaragoneses' into develop

Conflicts:
	.classpath
	.settings/org.eclipse.jdt.core.prefs
Merge branch 'master' into develop