titanic
titanic
resolved conflict in _titanic.html.erb
started preliminary fitting