work on form
Merge branch 'master' of github.com:conradkleinespel/42oo