added test.java
Merge branch 'userstory' into develop
added class.java