some small changes
Merge branch 'master' of https://github.com/griffint/POECakes
Creating testing, moving, and calibration functions
some more changes
fixing merge