merge master
merge master
added a form and its able to add to db