sails new
resolving readme conflict