Use String.format() instead of '+'
Merge branch 'master' of github.com:grafitter/java_final_project