Make murder function more complica- err, I mean expansive
Add comments to argparse function
Merge branch 'master' into feature

Conflicts:
	argParse.c
Finish basic chdir (cd) functionality and update the prompt