Placement errors completed
Merge branch 'master' of github.com:chettam/StarShips

Conflicts:
	data/starships.db
	models/grid.rb