first commit
Merge https://github.com/jackdamiels/tips