commit box table so that you can accept michael's changes
Merge branch 'master' of https://github.com/aaronjfisher/Adaptive_Shiny

Conflicts:
	eagle_gui/shinyApp/boxTable.csv
because code should make you smile