commit on new_branch
commit on master
resolved merge conflict
commit I want to revert
Revert "commit I want to revert"

This reverts commit f3c0d038132610a6d17837228dd4b90a2733a05b.
hello commit
Merge branch 'master' of https://github.com/Neilos/octocat into new_branch
an important commit that tom is missing out on
added what shit