no message
Merge branch 'master' of https://github.com/aaronjfisher/Adaptive_Shiny

Conflicts:
	eagle_gui/shinyApp/boxTable.csv
Modified computation of expected duration; changed order of boxTable entries; changed message regarding how to exit