Got makefile generating jars properly and finalized the algorithm bug fixes when opening new files or resetting.
Merge branch 'master' into os-project