fixed long line
fixed indentation
Merge pull request #68 from bsplay/comparablefix

Comparablefix
Added html for upload page
Merge remote-tracking branch 'boris_webapp/webapp' into webapp
Attempt to merge boris and my stuff
Merge remote-tracking branch 'upstream/master' into webapp
Merge remote-tracking branch 'rich/webapp' into webapp
Integrated Boris and my stuff

Fixed issue with sending compared data to diff.html
Merge remote-tracking branch 'rich/webapp' into webapp
various UI changes