except
Merge pull request #15 from nachokb/master

default images
type
html
Merge branch 'master' of https://github.com/inaka/fyp-server
html2
Merge pull request #16 from nachokb/master

add pictures upload