capture mcmc diagnostics on fitting tab only
tab 1 layout
tabs for data upload page
fix server.R dependence on input$rawdata
fix dependence on input$rawdata in ui.R
change to 1 upload button, separate tab for editing
merge

Merge branch 'master' of https://github.com/Statnet-Summer-Project/ergm-shiny

Conflicts:
	ergm-app/server.R