Notes on tutorial on help.github.com
Conflicts resolived