possibly making changes
rechecking most recent
Merge branch 'master' into new_form
just push it to master she said
Merge pull request #12 from case-eee/new_form

New form
fixes merge conflicts