getting back to yesturdays state after branch was deleted
fixing git fast forward
Merge branch 'refs/heads/rob-branch' of
https://github.com/bookoo/gruen-testing.git into HEAD