Front end for supplementary material
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/taskBuilder/views.py
Merge pull request #27 from aguibert/master

Front end for supplementary material
Merge branch 'master' of https://github.com/travisreed-wf/494Sandbox