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

Conflicts:
	JSS Paper/tex files/JSS Paper.pdf
Merge branch 'master' of https://github.com/aaronjfisher/Adaptive_Shiny
Made edits to paper.