Reset (press 'r')
Merge branch 'master' of https://github.com/tsturm/sandstorm