Slight refactoring to Ship and Grid classes
Slightly refactors grid.insert functionality but still needs more refactoring
Grid can be displayed as a grid
Changed columns and rows so that letters run along the X axis
Show_as_grid method displays grid with x and y axis names
Grid can now add ships of any length, horizontally or vertically
Fixes merged conflicts