updated file uploader to use a file input
merged conflicts
added test html
checking progress
Merge branch 'nate' of https://github.com/buffalohackers/WebDrop into nate
drag and drop works
Merge branch 'master' of github.com:buffalohackers/WebDrop into joe
jade updated