added category form
Merge pull request #12 from jgkingston/master

added category form
updated merge conflict