ignore emacs style lockfiles
various changes
Merge branch 'master' of github.com:dylanmaryk/Cost-Time-Analysis