soft reset
Merge branch 'master' of ssh://github.com/Marcus1103/graduation-project