edit html and add css styling
conflict fixes
Merge pull request #29 from KevinFXue/kformiteration1

Kforminteration1