Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
adds field for student part of assignment
renamed some functions
merged in function name changes from gh-pages