added forms
fixed conflicts
Merge pull request #9 from mikewong79/forms

Forms