more history
Merge branch 'master' of github.com:quezak/misc