lost some stuff
Merge pull request #6 from jrf0110/6-history

Messed up history