Merge branch 'patch-1' of https://github.com/tcyrus/FreeCodeCamp into staging

Conflicts:
	server/views/coursewares/showHTML.jade

server/manifests/README.md

@@ -4,5 +4,5 @@ files are generated at runtime and their content is determined by
 the content of the files they are derived from.
 
 Since the build process is not exactly the same on every machine,
-this files are not tracked in github otherwise conflicts arise when
+these files are not tracked in github otherwise conflicts arise when
 building on our servers.

server/views/coursewares/showHTML.jade

@@ -33,7 +33,6 @@ block content
                     label.negative-10.btn.btn-primary.btn-block#submitButton
                         i.fa.fa-play
                             |   Run tests (ctrl + enter)
-                    br
                     if (user)
                         .button-spacer
                         .btn-group.input-group.btn-group-justified
@@ -91,9 +90,8 @@ block content
                                 #challenge-checkmark.animated.zoomInDown.delay-half
                                     span.completion-icon.ion-checkmark-circled.text-primary
                             .spacer
-                            .row
-                                if(user)
-                                    #submit-challenge.animated.fadeIn.btn.btn-lg.btn-primary.btn-block Submit and go to next challenge
-                                else
-                                    a.animated.fadeIn.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress
+                            if(user)
+                                #submit-challenge.animated.fadeIn.btn.btn-lg.btn-primary.btn-block Submit and go to next challenge
+                            else
+                                a.animated.fadeIn.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress
     include ../partials/challenge-modals