Ignore temporary files in app/tmp and app/webroot/uploads from version control.
Merged conflicts.
Set timeout to 60 seconds
Merge branch 'master' of https://github.com/ualibraries/Guide-on-the-Side