file upload style for #47
Merge remote-tracking branch 'origin/master'