Finished my java method
Merge branch 'master' of https://github.com/captaincrutches/cs2340-team47