first commit
Merge branch 'master' of https://github.com/iDFLO/ece368
2nd commit