Fixed #15, added #18 solution

Also added problem 17 java file