changed getup.java
deleted commets
Merge branch 't1'