add junit test
Merge branch 'zz_local'
Merge branch 'master' of https://github.com/zhaozheid/CCD_SOEN6441_TD
small changes
Merge branch 'master' of https://github.com/zhaozheid/CCD_SOEN6441_TD
Merge branch 'master' into zz_local