added UserFrame.java
merging