Merge remote-tracking branch 'origin/master'

Conflicts:
	shiny-app/server.R

shiny-app/server.R

@@ -21,5 +21,8 @@ shinyServer(function(input, output) {
     library(ggplot2)
     library(corrplot)
     pairs(emergency2013[, input$show_vars, drop = FALSE])
+
+    emergency2013[, input$show_vars, drop = FALSE]
+
   })
 })

shiny-app/ui.R

@@ -16,7 +16,8 @@ shinyUI(fluidPage(
         id = 'dataset',
         tabPanel('emergency2013', dataTableOutput('mytable1')),
         tabPanel('emergency2013', dataTableOutput('mytable2')),
-        tabPanel('emergency2013', plotOutput('myplot'))))
+        tabPanel('emergency2013', plotOutput('myplot')))
     )
   )
+)
 )