fix merge
Revert "fix merge"

This reverts commit d29f951877bfd20d484e4f2b09794f278987c8fe.
init date
Merge branch 'master' of https://github.com/pdavid0/GTI785Lab2Lib