new button
Merge remote-tracking branch 'upstream/master' into preview
preview
rm
Merge pull request #24 from travisreed-wf/preview

Preview
Tweak readme
Separated student | author | admin both in front end and backend. Front end is determined by classes student | author | admin respectively and backend added as decorator to permissions_student | permissions_author | permissions_admin
Added task builder to author class
student exam view
Front end for supplementary material
Merge pull request #25 from AJH693/master

Permissions for Front & Back .. ENDS *** DATABASE CHANGE ***
Merge pull request #26 from travisreed-wf/preview

student exam view
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/taskBuilder/views.py
permissions updated on models.py
Merge branch 'master' of https://github.com/travisreed-wf/494Sandbox
Merge pull request #27 from aguibert/master

Front end for supplementary material
Merge branch 'master' of https://github.com/travisreed-wf/494Sandbox
Merge pull request #28 from AJH693/master

Models.py update for permissions
Merge pull request #6 from ISUWebPortal/master

update my repo