Merge branch 'master' into hw4

Added the template files.