Combination commits
Merge branch 'master' of github.com:ASirik/githowto