patched jitter nullpointer issue
Merge branch 'master' of https://github.com/JayH5/hons-simulator
Actually fixed resource masses
Merge branch 'master' into GP