31675d7 Merge branch 'master' of github.com:caelum/techradar