fixing version issues
Merge branch 'master' of https://github.com/MassBayCS225/EMS