Merged tested crlf
Merge branch 'master' of https://github.com/kevinlehung/Java-Work.git
Tested crlf