switching branch
works
fixed merge non-conflict
Merge pull request #28 from ryanbahniuk/form-fixing

Form fixing