commit2
Merge branch 'master' of https://github.com/glacoste/shorthello
commit3