Merged both encryption/decryption into one file

Also added command-line argument parsing, and reading-writing on files