Started on parsing plaintext file
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/AES.java
parsed input and key