fix form and delete fonts
fix conflixt
Merge pull request #17 from choseitan/oidev

fix form and delete fonts