updating
Merge branch 'master' of https://github.com/BugwarsREU-JPFTeam/jpf-core2.git