Finally got core functions working
fixed bugs
added comment so that Kevin can work on command line parser
modified comment so that Kevin can work on commmand line parser
Added additional option parsing
Added argparse commands to file and fixed conflicts
Merge remote-tracking branch 'upstream/master'

Conflicts:
	wordcrypt.py