Added the ability for the form to allow for a new ship to be added to the datbase. (still need to add the actual call to the database if ship is valid)
conflicts found in admin form... mergin anyways
Merged with michael on the form and removed conflicts
Merge branch 'database_robert' of https://github.com/TheDizzler/space-union into database_michaelG
got gridview to update itself... finaly