Changed the history to keep track of the 2nd state instead of the first
Merge branch 'master' of https://github.com/valentinp/aer1513project