uploading new files for activity show page
Merge branch 'master' of https://github.com/RJFryman/nodemon