Reverted broken commits and fixed Cipher.java#696

cartoonytouch wants to merge 2 commits intosinansonlu:mainsinansonlu/CS102-Git-Tutorial:mainfrom

cartoonytouch:maincartoonytouch/CS102-Git-Tutorial-1:mainCopy head branch name to clipboard