update iss1
initial commit iss6
update MainController.java
Merge branch 'master' into iss6