Claimed Jupiter.txt for drunken-octo-meme
fixed conflict in Jupiter.txt