added in a flag which may or may not work and deleted an extra space
Merge branch 'metafree' of https://github.com/danallan/octal-application into origin/metafree

Conflicts:
	server/apps/exercises/views.py
Merge branch 'metafree' of https://github.com/danallan/octal-application into origin/metafree
Merge branch 'metafree' of https://github.com/danallan/octal-application into origin/metafree

Conflicts:
	server/apps/exercises/views.py