fixed form stuff
Merge branch 'master' of https://github.com/cms2882/cappp
Merge branch 'master' of https://github.com/cms2882/cappp