add files
add files
Merge branch 'master' into temp

Conflicts:
	admin.R
	challenge.Rmd
	refresh.R