Back to before Revert
Merge branch 'master' of https://github.com/hansnataniel/gitproject