Resolve the conflict of closed PR #146#375

Merged

christianbender merged 3 commits intoTheAlgorithms:masterfrom

GammaBurst101:palindrome

Mar 29, 2018

Commits on Jan 31, 2018

Merge branch 'master' of https://github.com/TheAlgorithms/Java
GammaBurst101
committed

Commits on Feb 3, 2018