reset
Merge branch 'master' of https://github.com/octopode/STAN_Project