Progress bar stuff -Scott
Merge branch 'master' of github.com:dorthwein/helping_scans
Resolved conflicts on show page