functional
works
marginally improved
pull from master
done
no conflicts
bug fix
rm .pid
no conflicts
Merge pull request #82 from ryanbahniuk/txt-rsz

Txt rsz
fixed merge conflicts
adding time to error message