reset 1 commit
solve conflicts in reset
Merge pull request #3 from rgg410/feature/testreset

reset 1 commit