cleaned up the code
Merge branch 'master' of github.com:cmart94/397_final_project

* 'master' of github.com:cmart94/397_final_project:
  New version of java application
more code cleanup