Format, boats controller, listing boats test
Fix typo on Assignment. rspec and test_unit on green
Merge Conflicts ok
Merge Conflicts ok