date testing finished
Merge branch 'master' of github.com:victorgaitour/Group3