Reconciled offline work
git commit 2
Merge branch 'master' of https://github.com/yannis-theodosopoulos/git_fusion