first one
Merge branch 'master' of https://github.com/johnecobo/demogit
second