Learn more about cloning repositories
You have read-only access
Merge branch 'master' into courseware Conflicts: controllers/bonfire.js controllers/resources.json views/bonfire/show.jade
