Work on making reset work as intended
Merge remote-tracking branch 'origin/master'