modified reg1 for from to 'to'. changed file to folder in counts.
Merge remote-tracking branch 'upstream/master' into python

"Updating with upstream"
Changed file to folder in prompt
made -d parameter instead of -f. Added check to deal with string only filenames
Merge pull request #7 from rustyb/python

Fixes #5