last details
Merge branch 'master' of https://github.com/momobo/Capstone_Dryrun