Merge branch 'master' of https://github.com/JohnLiranJavaProject/JavaProjectColman

Conflicts:
src/FirstPackage/FirstClass.java
Test2