Merge branch 'ux-improvements' of https://github.com/terakilobyte/freecodecamp into terakilobyte-ux-improvements

Conflicts:
	controllers/bonfire.js
	controllers/resources.js
	public/js/main.js
	views/bonfire/show.jade

app.js

@@ -440,6 +440,8 @@ app.get(
     coursewareController.returnIndividualCourseware
 );
 app.post('/completed-courseware/', coursewareController.completedCourseware);
+app.post('/completed-zipline-or-basejump',
+  coursewareController.completedZiplineOrBasejump);
 
 // Unique Check API route
 app.get('/api/checkUniqueUsername/:username', userController.checkUniqueUsername);