opened java
fixed merge errors
fixed merge errors
fixed merge errors
fixed merge errors
fixed
fixed merge errors
Merge branch 'master' of https://github.com/42mileslong/school-java