haha wtf
Merge branch 'master' of https://github.com/Tsukumokun/CS-370
reverted java