Added propper history
Merge branch 'master' of github.com:micahh2/jarvis