just fixing the merge so I can resync

just fixing the merge so I can resync
merging again

again
Merge branch 'master' of https://github.com/runmycode/tyler

Conflicts:
	companionpages/companionpages/urls.py
	companionpages/supportingmaterials/models.py
	companionpages/supportingmaterials/views.py