work on template
Merge branch 'master' of github.com:Gabriano/ift3912-proto