add content to front page, edit layout of help page
edit spacing of columns in data upload page
add content to front page
add content to help page
edit text in helper box on data upload page
add message to Modify Attributes tab (as a placeholder)
Merge branch 'master' of https://github.com/Statnet-Summer-Project/ergm-shiny

Conflicts:
	ergm-app/ui.R