Merge branch 'master' into design
This commit is contained in:
		@@ -23,9 +23,9 @@
 | 
				
			|||||||
              i.caret
 | 
					              i.caret
 | 
				
			||||||
            ul.dropdown-menu
 | 
					            ul.dropdown-menu
 | 
				
			||||||
              li
 | 
					              li
 | 
				
			||||||
                a(href='/challenges/a-one-minute-introduction-to-free-code-camp')
 | 
					                a(href='/')
 | 
				
			||||||
                    span.ion-map
 | 
					                    span.ion-map
 | 
				
			||||||
                    | My curriculum
 | 
					                    | My Challenges
 | 
				
			||||||
              li
 | 
					              li
 | 
				
			||||||
                a(href='/account')
 | 
					                a(href='/account')
 | 
				
			||||||
                  span.ion-person
 | 
					                  span.ion-person
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user