reset soft to before having opened project in intelliJ
Merge branch 'develop' of github.com:jonjon927/skeleton_exchange into develop