changed some programs
Merge branch 'master' of https://github.com/gunantosteven/application-java-using-framework