adding to history no longer gives errors but doesn't save either
Merge branch 'master' of https://github.com/PepticSet/SwEng2014Team2