finl commit of the day
Merge branch 'master' of https://github.com/tim427/minorproject